dump1090: update to 10.2

Remove upstreamed GCC14 patch.

Backport GCC15 patch.

Signed-off-by: Rosen Penev <[email protected]>

diff --git a/utils/dump1090/Makefile b/utils/dump1090/Makefile
index 89a181cdbb36ea4129f934b5e9dbac9d50b1161f..907f02761beb0ed4b2ee19fa2c24f484d62d6a81 100644 (file)
--- a/utils/dump1090/Makefile
+++ b/utils/dump1090/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dump1090
-PKG_VERSION:=9.0
-PKG_RELEASE:=3
+PKG_VERSION:=10.2
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)
 PKG_SOURCE_URL:=https://github.com/flightaware/dump1090
-PKG_MIRROR_HASH:=5acbfd0afbed020fc8328b44ade406c855cf617a54a9049b309586e181242ec8
+PKG_MIRROR_HASH:=3763c053ae3d7ddf4eee339a88a8f3e5e4af51296d120c0d501330ee260a090e
 
 PKG_MAINTAINER:=Álvaro Fernández Rojas <[email protected]>
 PKG_LICENSE:=GPL-2.0-or-later

diff --git a/utils/dump1090/patches/010-gcc14.patch b/utils/dump1090/patches/010-gcc14.patch
deleted file mode 100644 (file)
index e702260..0000000
--- a/utils/dump1090/patches/010-gcc14.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f3b92b89dcd6311f15c777ee1ab7c4469880c7df Mon Sep 17 00:00:00 2001
-From: Ralf Ertzinger <[email protected]>
-Date: Sun, 28 Jan 2024 18:28:05 +0100
-Subject: [PATCH] Fix incorrect `calloc()` parameter order
-
-In two instances, the paramter order for `calloc()` calls are reversed,
-with the element size in the first parameter and the count in the
-second. When building under Fedora rawhide with gcc 14, this is flagged
-as an error.
-
-Signed-off-by: Ralf Ertzinger <[email protected]>
----
- adaptive.c | 2 +-
- net_io.c   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/adaptive.c
-+++ b/adaptive.c
-@@ -195,7 +195,7 @@ void adaptive_init()
-     adaptive_burst_window_remaining = adaptive_samples_per_window;
-     adaptive_burst_window_counter = 0;
- 
--    adaptive_range_radix = calloc(sizeof(unsigned), 65536);
-+    adaptive_range_radix = calloc(65536, sizeof(unsigned));
-     adaptive_range_state = RANGE_RESCAN_UP;
- 
-     // select and enforce gain limits
---- a/net_io.c
-+++ b/net_io.c
-@@ -104,7 +104,7 @@ struct net_service *serviceInit(const ch
- {
-     struct net_service *service;
- 
--    if (!(service = calloc(sizeof(*service), 1))) {
-+    if (!(service = calloc(1, sizeof(*service)))) {
-         fprintf(stderr, "Out of memory allocating service %s\n", descr);
-         exit(1);
-     }

diff --git a/utils/dump1090/patches/010-gcc15.patch b/utils/dump1090/patches/010-gcc15.patch
new file mode 100644 (file)
index 0000000..f82c755
--- /dev/null
+++ b/utils/dump1090/patches/010-gcc15.patch
@@ -0,0 +1,39 @@
+From c69eafaa34ffec88adbfa6d4573b92c57119d6c4 Mon Sep 17 00:00:00 2001
+From: Stefan de Konink <[email protected]>
+Date: Tue, 8 Jul 2025 20:02:53 +0200
+Subject: [PATCH] =?UTF-8?q?Fix=20initializer-string=20for=20array=20of=20?=
+ =?UTF-8?q?=E2=80=98char=E2=80=99=20truncates=20NUL=20terminator=20but=20d?=
+ =?UTF-8?q?estination=20lacks=20=E2=80=98nonstring=E2=80=99=20attribute?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ ais_charset.c | 8 +++++++-
+ interactive.c | 2 +-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+--- a/ais_charset.c
++++ b/ais_charset.c
+@@ -1,3 +1,9 @@
+ #include "ais_charset.h"
+ 
+-char ais_charset[64] = "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_ !\"#$%&'()*+,-./0123456789:;<=>?";
++char ais_charset[64] = {
++    '@','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O',
++    'P','Q','R','S','T','U','V','W','X','Y','Z','[','\\',']','^','_',
++    ' ','!','"','#','$','%','&','\'','(',')','*','+',
++    ',', '-', '.', '/', '0','1','2','3','4','5','6','7','8','9',
++    ':',';','<','=','>','?'
++};
+--- a/interactive.c
++++ b/interactive.c
+@@ -140,7 +140,7 @@ void interactiveShowData(void) {
+     static bool need_clear = true;
+     uint64_t now = mstime();
+     char progress;
+-    char spinner[4] = "|/-\\";
++    char spinner[4] = { '|', '/', '-', '\\' };
+     int valid = 0;
+     double signalMax = -100.0;
+     double signalMin = +100.0;